keyboard: Add/document "height" optional property

This will allow OSK descriptions to declare "tall" keys. May be
used in combination with the "start" property added in previous
commits, in case a gap needs to be explicitly left.

No OSK description uses this yet.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3162>

diff --git a/data/README.osk-layouts b/data/README.osk-layouts
index 88e746e4de9a8bf10ceed4d34518fa988f084f0d..8c58f62e4d64293cfe950254b61b04786ec57410 100644 (file)
--- a/data/README.osk-layouts
+++ b/data/README.osk-layouts
@@ -63,7 +63,10 @@ it has the following structure:
     accepted.
   - width (Double): Relative width of the key in the
     row. 1 is for a square key. Multiples of 0.5 are
-    accepted.
+    accepted. The implicit default value is 1.
+  - height (Double): Relative height of the key in
+    the grid. The key will overflow downwards. Multiples
+    of 0.5 are accepted. The implicit default value is 1.
   - level (Integer): Level that the key switches to.
     See the levelSwitch action.
   - action (string): Action performed by the key,

diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index bf6317840100a04564a20354c59be69c7bf871b0..56c8d585ea99c7cdc9744d41dfba117a73686265 100644 (file)
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -1564,7 +1564,7 @@ export const Keyboard = GObject.registerClass({
             if (key.action || key.keyval)
                 button.keyButton.add_style_class_name('default-key');
 
-            layout.appendKey(button, key.width, 1, key.leftOffset);
+            layout.appendKey(button, key.width, key.height, key.leftOffset);
         }
     }